From: Andrew Cooper Date: Fri, 15 Jul 2016 12:07:09 +0000 (+0100) Subject: x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~755 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=c31d8368a60d4eecf371193a3d144418c48063c6;p=xen.git x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 2fc002b c/s 2fc002b "xen: Use a typesafe to define INVALID_GFN" changed INVALID_GFN to be a boxed type. Identified by a Travis randconfig run: https://travis-ci.org/xen-project/xen/jobs/144980445 Signed-off-by: Andrew Cooper Acked-by: Tim Deegan --- diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c index 38bdf9232c..69e56c5c4e 100644 --- a/xen/arch/x86/mm/shadow/none.c +++ b/xen/arch/x86/mm/shadow/none.c @@ -42,7 +42,7 @@ static unsigned long _gva_to_gfn(struct vcpu *v, struct p2m_domain *p2m, unsigned long va, uint32_t *pfec) { ASSERT_UNREACHABLE(); - return INVALID_GFN; + return gfn_x(INVALID_GFN); } static void _update_cr3(struct vcpu *v, int do_locking)